Feature/ticket 173