Merge pull request #761 from justinsg/master