Feature/issues1