Feature/fix issue 118