- Some refactoring, tbh I have forgotten :/
Merge remote-tracking branch 'origin/master'