Patch 1

hi,buddy,
   i change something ,review & merge by your please