Merge pull request #2 from 4o66/master

Fix for Issue #1