Resolve issue 176
Merge pull request #237 from Dmitry-Me/resolveIssue176

Resolve issue 176