* Merging pull request #11