merge from mangoszero

...izerox thanks

Signed-off-by: Salja <salja2012@hotmail.de>