Merge pull request #2 from elizabethbarr/tyler

updating branch
Merge remote-tracking branch 'origin/master' into tyler