Issue/#20

fixes #20