We find the maximum number of maximal independent sets in two families of graphs: all graphs with n vertices and at most r cycles, and all such graphs that are also connected. In addition, we characterize the extremal graphs. This proves a strengthening of a conjecture of Goh and Koh [3]. We do the same for the maximum number of maximum independent sets, generalizing a theorem of Jou and Chang ...