test
changed some stuff to prevent nullpointer
.
Merge remote-tracking branch 'origin/master' into testbranch