Updated for golang 1.0