Merging latest master from Georgios 

Thanks!