Merge pull request #531 from mayeut/issue-289