Merge branch 'master' of https://github.com/dyadyamaus/Bum
Some refactoring