Resolved Issue #75.
Merge pull request #117 from djmccormick/master

Resolved Issue #91
Merge pull request #118 from djmccormick/issue75

Resolved Issue #75.