Merge branch 'matt'

Conflicts:
readme.md