Merge branch 'clean-up'

Conflicts:
README.md