Merge pull request #806 from AxlPr/master