Merging pull request and fixed #10