Merge files from my fork

Will continue development in a branch of the official repo instead.