Issue/13

fixes #13