Added changes from latest revision.