Merge pull request #826 from jakeogh/master