Some errors fixed
Aus Map einer HashMap gemacht
Merge remote-tracking branch 'origin/master'