Updates
Merge branch 'master' into resumator-settings