aisouard Merge pull request #49 from mayeut/release-60-support