fixed minor bugs, added more comments
Merge pull request #2 from maseek/GP3-Submission

Merge pull request #1 from maseek/master
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"
Merge pull request #4 from maseek/master

merge