Pull request to fix #10

Here is my pull request to close #10.