Issue #82 fix.
Merge pull request #84 from lyncodev/issue82

Issue #82 fix [trunk]