Implementation for Issues #12, #22
Merge pull request #32 from gitcac/husain-wip

Implementation for Issues #12, #22