Merge pull request #2 from DanielleWingler/master

merge changes
Merge pull request #10 from ashmbrown/master

Merge pull request #2 from DanielleWingler/master