Feature/issue 83

fixes issue 83