Feature/issue 69