assemble icon
Merge branch 'fixbug-0.03' into develop
Merge branch 'develop'