Next version: 2.1