Update fork

Sync my fork with the main repo.