Added back in the ability to use class names as well as id's
resolved merge conflict
fixed readme conflict