Updated for Go 1.3