Issue/#37

fixes #37