Changes done by Marco Steinh (kermi) 

Changes from the community I guess.
I just resolved the mergeconflict.