Fix tutorial examples

Closes #525
Merge pull request #535 from almarklein/example-fix

Fix tutorial examples