Issues #203 #204 #205 #206 Implemented
Merge pull request #208 from gitcac/issues-206-205-204-203

Issues #203 #204 #205 #206 Implemented