Merge branch 'dev'
Remove console.log