Small cleanup and README update
Merge branch 'master' into experiments