Issue #170 Bug Fix
Merge pull request #171 from gitcac/issue-170

Issue #170 Bug Fix