Bugfixes
Merge branch 'master' of ssh://git@github.com/tobiasbockrath/BigData.git