Merge pull request #654 from mayeut/master