Update README.md
Merge branch 'experimental'
Merge branch 'experimental'
Various cleanups, esp for PEP8
Merging changes