fixes
Merge branch 'master' of github.com:ty1824/crush