Remove magic numbers
Merge pull request #2 from david-geo-holmes/master

Remove magic numbers