Merge pull request #16