Issue 17

solves #17