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