Merging pull request #18