Fixed some refactoring
Merge branch 'master' of github.com:alexw91/gametech