Update master with examples from gh-pages
Merge remote-tracking branch 'upstream/master'

* upstream/master:
Merge pull request #37 from georgecrawford/master

Update master with examples from gh-pages