Better folder handling
Merge branch 'master' of github.com:markuz/scripts