Clean up & fix examples
Merge pull request #91 from SomeoneWeird/master

Clean up & fix examples