Merge branch 'master' into ethan_test
Change readme
Merge branch 'ethan_test'