Issue/#9

fixes #9