Fork update

Update fork to latest commits