Merge branch 'dev'
A new feature

Signed-off-by: Wim Tibackx <tibackx.wim@gmail.com>
Fixing a bug

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

Conflicts:
	README.md