fix and statusupdate
Merge remote-tracking branch 'origin/master' into dev_ruben