Changes and corrections to examples
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from ifpingram/master

Changes to examples