typo
tweak README
merge from upstream