Merge pull request #1 from gazzhop/master

First merge