Merge pull request #1 from nuggad/master

sync production branch with master
Merge pull request #2 from nuggad/production

Merge pull request #1 from nuggad/master