Initial commit for super cool feature
Merge branch 'niffrig_new' of https://github.com/openUtility/FooBar into niffrig_new