Almost working as OO classes
Merge branch 'master' of https://github.com/rogerlacher/peaq
Upstream version was newer than local version