Dop/issue7 finalize

Final fix for #7