Fix Issue #1

Here is the pull request for Issue #1