merge author's updates to fork

merge author's updates to fork