Chris wrote some stuff.
Merge pull request #2 from FlipLucca/patch-2

Chris wrote some stuff.