Merge pull request #16 from evmarkov/master

Magic numbers fix