Merge pull request #61 from menghong777/master

Fixed bugs.
Final touch up
On the spot final changes LOL~