merge up readme and update it
Merge branch 'master' into golden_master