FIXES
Merge pull request #35 from caitlinvangundy/master

FIXES