Check for Integer OverFlow
Merge origin/master