Version number increment and TODO change