Issue/11

fixes #11 
And here