refactorings
Merge branch 'master' of https://github.com/ryantk/crafty