Updated to go1.3