modified all through, the last 2 version
Merge pull request #3 from vvv214/master

modified all over~ u modify it the last time and then can upload! (though there is many things to do)