Code update

Code updated for go 1.1