Updating to current version

Forked too soon!