Merge pull request #17 from lukemesiti/lauren

Awesome work on this, Lauren!