Merged for release 1.0