Merging pull request 8