Feature/issue 73