Feature/issue 63