Istvan accidentally pushed the old contribution to github - this is the
fixed update