Issue 27

solves #27