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