Refactoring and fixing #112
Merge branch 'develop' of github.com:amooma/GS5 into develop