Fixed magic numbers
Merge pull request #110 from swansond/MagNums

Fixed magic numbers