Merge pull request #100 from sigal/master

update backend
Merge pull request #101 from sigal/master

update backend/frontend
update backend