Fixed #84
Merge pull request #86 from gausie/fix

Fixed #84