Fixes #186
Merge pull request #190 from asadoughi/fix_186

Fixes #186