Merge pull request #137 from maiklos/2.1.2

2.1.2
Merge pull request #138 from maiklos/2.1.2

fix encoding of filename when copied into LinkedFiles (#43)
fix exception during startup