Fix magic numbers
Merge pull request #577 from igorko/master

Fix magic numbers