Revert "Merge pull request #1 from maseek/master"
Merge pull request #3 from maseek/revert-2-GP3-Submission

Revert "Merge pull request #1 from maseek/master"