Feature/fix issue 94