Merge pull request #549 from mayeut/master