Merge pull request #270 from danvk/issue-126