Fixed shifting
Merge branch 'master' of github.com:Ultixan/ohnoes