closes issue #13 and issue #15
Merge pull request #16 from marcuspoehls/issue-#13and#15

closes issue #13 and issue #15