Merge pull request #909 from zachjs/master