Merge pull request #21 from kristenmills/master

things