Some Bugfixes and preparations for Multithreading.
Merge branch 'master' of https://github.com/NPTricky/img-classification-ss13