Fix Bug and final prepare to Azure

if no problem,this is the first branch