1 0

Pull 1.0 changes to master