line breaking issue fixed
add icon support
Merge remote-tracking branch 'origin/master'
add byline