Merge pull request #452 from hnyman/entropy