Feature done, need some code cleaning and correct installation of client browser plugin