Feature/issue 46 minor fixes