merged README changes from upstream