sync
Merge github.com:slayoo/advoocat
wip on bombel2