Merge pull request #39 from snordt/master

Added overflow
code cleanup