Merge branch 'dev'

See GitHub Issue #78

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
Acked-by: Stammtisch <project-monk@dresearch-fe.de>
Merge branch 'master' into dev