Cool stuff added.
More cool stuff.
Merge branch 'cool-stuff'