Fixed type conversion warnings.
Merge pull request #35 from Bo98/type-fixes

Fixed type conversion warnings