Feature/rectangle