Hopefully better file handling
Merge branch 'master' of github.com:em-mo/sommarhack