Merge pull request #572 from mayeut/master