Per issues #33 and #34
Merge branch 'master' of https://github.com/DeathShadow/Contra