merge in more changes
bump version to rc1.0