Updated to go1.1