LINT fixes
Merge branch 'master' of https://github.com/Ligthert/NLD_Units