Issue 54

solves #54