Merge pull request #543 from mayeut/master