issue 42 implemented