Feature/fix issue 93