Updating fork

Updating dfederlein fork