Fix
Add logs
Merge branch 'feature/logs' into develop