Fixed overflow issue
Merge pull request #15 from ridiekel/master

Fixed overflow issue