merging pull request #20