added files from issue #39
Merge pull request #44 from michaelrice/issue39

added files from issue #39