Fix overflow, fixes #16
Merge branch 'master' of github.com:jipio/jipio.github.com