Update Readme
Update Icon
Update version Number
Fix merge error