Merge pull request #38 from mainland/master

Fix overflow check.
Bump upper bound on base.