Issue #70 fix.
Merge pull request #71 from DSoftOut/issue-70

Issue #70 fix.