Feature/fix issue 116