Issue #124 implemented
Merge pull request #125 from gitcac/issue-124

Issue #124 implemented