Created an icon
Merged master