pushing changes from macbookpro2 as of 31jul2013 at about 6:30am Beijing time