First commit after crash
Merge https://github.com/dreymaior/sgvpb_project