closes #8
Merge pull request #9 from wscherphof/#8

closes #8