Merge pull request #19