Issue 4

solves #4