Revert "Implementation of Issue #86"
Merge pull request #98 from gitcac/revert-97-issue-86

Revert "Implementation of Issue #86"