Fix casts causing run time errors
Merge pull request #39 from dannycoh/develop

Fix casts causing run time errors