merge from mangoszero

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