Merge pull request #474 from hnyman/entropy-1505