Issue 32

solves #32