fix

fix former status bug, we should not recored prepare as former status
fix 'From' in makeTimeout
Merge pull request #80 from yifan-gu/proj3

fix