Completed before the talk
Merge pull request #1 from krisajenkins/master

Completed before the talk