Issue 16

solves #16