Merged to master after like over a year of keeping everything in an another branch (???)