Updated to use Go 1.1