Resolve all fuckups
Merge origin/master