Updated to compile with go1.0.3