Issue/#17

fixes #17