Fixes issue 102
Fixes issue 105
Merge pull request #110 from bparadie/fixes-105

Fixes issue 105
Merge pull request #108 from bparadie/fixes-102

Fixes issue 102
Fixed sinon errors in tests