Workaroud #3
Merge branch 'master' of https://github.com/Dark-Confidant/Massacre