Some Bugs and Features
Signed-off-by: Micha.Schubert <moses-junior@web.de>