console.logs removed
Merge remote-tracking branch 'origin/master'
console.logs removed