Issue/11

fixes #11