2.1

-- Added icon
-- Some fixes
-- Complete code