Update for Go 1.0