merge pull request #18