Merged surajair's changes 

Surajair's changes make it possible to specify a class that has to be removed from the visible elements.