Update to latest version

Update all files to latest version with commit from  RodrigoEspinosa
(thanks again for the modification!)