Feature/fix issue 98