fixed entropy calculations
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'