Merge pull request #2 from scwu/front-end

Front end
update