ui done. test done
Merge pull request #6 from owensss/master

ui done. test done