fix issue 82
Merge pull request #87 from satrent/issue82

Issue82