Signed-off-by: redtrumpet <jonas_ehrhard@yahoo.de>
Some improvements