Sept.2nd,2014

some bug fixed