Fix Issue #6

Here is the pull request for Issue #6