Merge pull request #454 from hnyman/fix-entropy