JW - updated to version 1.0-beta.3