Issue/#27

fixes #27