Definition is an object property... change examples appropriately
Merge remote-tracking branch 'upstream/master'
Fix upstream changes
Merge pull request #6 from jmccrae/master

Some more things