Taken into account @ediosyncratic's review.
Merge pull request #1945 from jimis/entropy

Taken into account @ediosyncratic's review.