Merge pull request #782 from Ansuel/master