Issues #325 #331 Implemented
Merge pull request #336 from gitcac/issues-325-331

Issues #325 #331 Implemented