20140416-02: third major update