Fixed ethan problems
Merge pull request #22 from kristenmills/master

Blah blah blah