Feature/fix issue 38