fixes de facto
Merge remote-tracking branch 'origin/boco'
Merge branch 'lovrenca'