Making all number parsing invariant

Fixes #38, fixes #39
v1.8.6.1
Merge remote-tracking branch 'origin/dev'