Added test #151
Merge pull request #162 from jbeard4/issue-154

Closes #154