[+] Added changes from master