added go 1.0 support