Issue 11
Merge pull request #12 from h4cc/dev-issue11

Fix for Issue 11