Autostart Fixing Nr. 4
Merge branch 'master' of https://github.com/c1ko/Automat