Merge pull request #28