Merge pull request #1 from kaylalewis/master

fixed