Revert "hi,please watch this change."
fix #1 issue
fix issue4 request #4