Updated fork

Given that this fork is old and unused, perhaps it can be updated in order to simplify multiple collaborators.