Merge pull request #72 from petermcd/example-fixes