Merge pull request #213 from colans/issue-212