Added Entropy
Merge pull request #2099 from pencilcheck/master

Added Entropy