Implementation of #137 #152 #176 #177 #178 #180
Merge pull request #182 from gitcac/issues-137-152-176-177-178-180

Implementation of #137 #152 #176 #177 #178 #180