Fix for Issue-006
Merge pull request #13 from PeterRyder/Issue005

Fix for Issue-005