Fixed entropy formula
Fixed whe function name
Merge branch 'release/0.02'