Added an option for icons
Merge remote-tracking branch 'origin/master'