Merged back old local changes (related to PEM) and updated versions