Merge pull request #514 from mayeut/issue-254