Bug Fix #197
Merge pull request #200 from gitcac/issue-197

Bug Fix #197