Supercapex objects only

Merging master and current objects_only branch