issue 41 implemented!