Merge pull request #163 from asadoughi/master

Fixes #158
LGTM