Use correct XXX2NUM macros
Merge pull request #17 from emboss/master

Use correct XXX2NUM macros