Added "click to install"

also some code cleaning
Cleaning code
Merge pull request #24 from mariogrip/master

Update