Fb marcel

Merge to master (gra + hrb)