Merge pull request #13 from ndhoule/dev

Refactor frontend, backend
Add missing dependency