Feature/frans pr 1