Addding @giladgo as contributor