Remove some magic numbers; use macros to clarify intent
Merge pull request #253 from nickodell/master

Remove some magic numbers; use macros to clarify intent