Merge new changes from main repo

Yay! Thanks for more changes guys!