Removed unnecessary int casts
Merge branch 'my'