Use consistent numbering

Fixes #585
Merge pull request #586 from SamWhited/issue585

Use consistent numbering