Merge pull request #217 from dyxliang/master

Pushing updates.
Merge pull request #8 from ZooTypers/master

fac
Refactoring the UI code.
Merge pull request #12 from fuskor/master

Getting the UI refactoring.