final commit for 1.0 beta