Update README and incorporate changes from aliang