Merge pull request #545 from mayeut/master