updated for release 1.0-beta.4