Merge pull request #11 from menghong777/master

Fixed UI bug and improved coding style.
File renaming