Removing magic numbers
Merge branch 'master' of https://github.com/mattk7/bd3