Functionality added for Issue #22
Merge pull request #38 from philstark/Issue_22

Functionality added for Issue #22