Fixing issue #1
Merge pull request #2 from oldskool/issue-1

Fixing issue #1