Merge pull request #9 from DavidVorick/master

Add entropy functions