Merge pull request #3 from nuggad/master

merge master to production
Merge pull request #4 from nuggad/production

Merge pull request #3 from nuggad/master