Updates
Merge pull request #4 from caitlinflanagan/master

Updates