Updates
Merge pull request #5 from caitlinflanagan/master

Updates