merge pull request #193

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Merge branch 'junkpad92-master'