cleanup
cleanup
changed README
Merge branch 'master' into github-master