Merge branch 'lukas' of https://github.com/devjb/plcanalyzer into lukas
Merge branch 'master' of https://github.com/devjb/plcanalyzer
Merge branch 'jochen'
Merge branch 'lukas'