Merged pull request #44 manually.