Merge branch 'dev' of https://github.com/dnclive/doverie into dev
Merge branch 'dev' of https://github.com/dnclive/doverie into dev