Implementation of Issues #141 #142 #143 #144
Merge pull request #158 from gitcac/issues-141-142-143-144

Implementation of Issues #141 #142 #143 #144