olaf text + sub changes
Merge branch 'praha18' into gh-pages