Final changes before v1 is released