Issue 23

solves #23