Removed a few magic numbers; our code has to be adaptable and explicit.
Merge pull request #55 from hgentry/master

Removed some magic numbers
Merge pull request #2 from Mikkeren/master

fast forward