issue-170
Merge pull request #206 from rbmoore/issue-170

issue-170