Merge pull request #1 from bbatsche/carlsbad

Carlsbad
Merge pull request #2 from gocodeup/master

Merge pull request #1 from bbatsche/carlsbad