Add 20131126 Senhong code from test server