fixes issue #70, #71
Merge pull request #73 from ted0000/feature/issue-70

Closes #70, #71