Merge pull request #1 from gazzhop/master

First merge
Merge pull request #2 from gazzhop/develop

Merge pull request #1 from gazzhop/master