Issue/#24

fixes #24