Some new feature

Signed-off-by: Wim Tibackx <tibackx.wim@gmail.com>
A bugfix

Signed-off-by: Wim Tibackx <tibackx.wim@gmail.com>
Merge branch 'dev'