Bug Fixes #76 #77 #78 #161 Implementation of #161
Merge pull request #163 from gitcac/issues-76-77-82-161-162

Bug Fixes #76 #77 #78 #161 Implementation of #161