Fixes #176
Merge pull request #177 from kkasravi/issue_176

Fixes #176