Merge pull request #28 from liugc/master

l
modified app/