Fix issue #82
Merge pull request #83 from avocode/fix-issue82

Fix issue #82