9/12/14 - implemented entropy