Issue/#21

fixes #21