Implementation of Issue #23
Merge pull request #55 from gitcac/husain-wip

Implementation of Issue #23