Merge branch 'master' of https://github.com/ichbindur/GrindHouse.git