Add icons
Update README.md, remove and modify some code
Merge branch 'master' into development