Merge pull request #1 from david-geo-holmes/master

Initial commit.
Remove magic numbers