Updated return type from float to int
Merge branch 'David' of https://github.com/ldevesine/Calvin into David
Updated return type from int back to float.