Issue/#15

fixes #15