Merge pull request #831 from kejadlen/master