Merged pull request #11.