fixed #50, somehow accidentially erased updates of @ben-joostens
Merge pull request #51 from franzose/2.0

fixed #50, somehow accidentially erased updates of @ben-joostens