Merge branch 'master' into dev
Merge pull request #10 from ThomasLengeling/master

update 0.7.1
Merge pull request #9 from ThomasLengeling/dev

Dev