Merge pull request #6 from ageei/master

Update frontend