example fixes
Merge pull request #1440 from andytaylor/master

example fixes