Merge pull request #2 from DanielleWingler/master

merge changes