Merge pull request #17