updates
Merge pull request #2 from CourtneyWalsh/master

updates