Revert "Issue 222"
Merge pull request #290 from jbeard4/revert-289-issue-222

Revert "Issue 222"