update fork with changes to master