sync
Merge github.com:slayoo/advoocat
not so much wip on bombel
Merge branch 'master' of github.com:slayoo/advoocat
wip on bombel