add the smart-copy-line support
Merge remote branch 'origin/master'