Tested master, still a few bugs ongoing.
Merged