Issue/#42

fixes #42