Merge branch 'release/0.0.51'
Checking for that int error
Merge branch 'develop'