10/16/14 - added new function to entropy