Merge pull request #18