Merge branch 'clemens'

Conflicts:
README