Issue/#45

fixes #45