fixes #83 + small bugfix