roll back to 0708
Merge branch 'master' of https://github.com/yison/giraffe_win