merge
Merge branch 'master' of github.com:siigna/main
changed IOException to catch files in use-writing error
Merge branch 'master' of github.com:siigna/main