Closed #3
Merge branch 'master' of https://github.com/dac-os/frontend