Merge pull request #3 from nuggad/master

merge master to production