Merge pull request #1 from nuggad/master

sync production branch with master