update backend/frontend
Merge pull request #168 from sigal/master

update backend/frontend