Merge pull request #1230 from codepox/master