merged pr 72 from dizzzy/selectivizr