Merge pull request #29