Bugfix and enhancment release 0.3.2

Signed-off-by: BostonShaker <ginfizz@posteo.de>