Code cleanup and tested app.
Merge pull request #29 from syqnew/master

Code cleanup and tested app.