pre-merge cleanup
Merge branch 'master' of https://github.com/woodbury/Musha