merged with qfw
Merge pull request #8 from jethro894/hangyin

merged with qfw