Merge pull request #2 from jakumo/master

Update all
475
Merge pull request #41 from stumbler/master

475