Bump version and minor changes