temp commit
2014/0928
Pull merge from Li Ying
WeiChien Commit