Bump version and minor improvement