Merge branch 'entropy'