Update 1.0 from dev