Update go path
merge master