update fork with changes from master