Implementation of Issues #83, #85, #88
Merge pull request #94 from gitcac/issue-83-85-88

Implementation of Issues #83, #85, #88