merging pull request #21