Merge pull request #25 from camertron/numbering_systems

Adding support for numbering systems
Merge branch 'master' into fix_plurals