Merge pull request #111 from Mihapro/master

Fix an overflow crash