Issue/#39

fixes #39