Update forked version with Kevin's commits