Merge branch 'release-1.0' into develop
Merge branch 'release-1.0' into develop
adding program icon and fixing #112