WIP: Fix/examples

I wanted latest master in this branch, so I did this:

git rebase master
git pull
git push

Now I just want to see that it merges correctly back into master.