Updated to support Go 1.1