Small fixes before new updater
Merge pull request #12 from Jorith/master

Small fixes before new updater