Issue #206 Implementation
Merge pull request #209 from gitcac/issues-206-205-204-203

Issue #206 Implementation