2014/10/02

fix some bugs