Resolves issue #296
Merge pull request #302 from LightGuard/issue_296

Resolves issue #296