initial update to 1.0 branch