Merge pull request #792 from fp7/master