Final commit for 1.0
final commit for 1.0