Dataviva.info x Master Branch

Hy Guys,

small changes before we merge dataviva.info to merge branch.

Regards,