Merge branch 'master' of https://github.com/Querschlag/hardware-management