MERGE WITH OFFICIAL REPO

thanks for all the help! would you like write access to the official repo?