Merge pull request #440 from hynek/examples

Polish up examples (somewhat)