Change <= to subset? to support Ruby 1.9
Use extract_options!