added logs
Merge branch 'develop'