with icons
Merge pull request #1 from aric87/master

with icons