Converted the modulus and remainder to ints
Merge branch 'develop'