<develop-2014/2/15-19:00> fixed bugs