Updated installer (untested); updated example ex2 (untested)