Fix previous semi-fixed fix
Merge branch 'master' of http://github.com/Dark-Confidant/Massacre