Issue #298 Implemented
Merge pull request #306 from gitcac/issue-298

Issue #298 Implemented