Merge branch 'optical_experimenter' of github.com:bpraseed/loxigen into optical_experimenter