Fix issue #97
Merge pull request #98 from lyncodev/issue97

Fix issue #97 [trunk]