Merged pull request #20 manually