Merge pull request #706 from mayeut/issue135