Merge branch 'dev' of github.com:cismet/cids-custom-wuppertal into dev
fixed #44
Merge branch 'bug/44-no-line-wrap' into dev