Syncing my fork

I'm hoping this will make my fork up to date