Daniels changes
Readded the / log(2), since we need to use log2 for entropy (see slides)