update all
Merge pull request #1 from JackDougherty/master

update all