Implementation for Issue #15
Merge pull request #33 from gitcac/husain-wip

Implementation for Issue #15