Merge branch 'dev'
Merge branch 'dev'
Use BigInteger to avoid overflowing

Fixes #1
Merge branch 'issue/1' into dev