Issue 11

solves #11