Changed Code
Merge branch 'master' of https://github.com/kakifish/ShifterMan