Merge pull request #233 from szabadka/master Fix integer overflow and slowness in entropy estimation.