Second commit of yida_civilometer, 06-09-13