Add PEM file support
Merge pull request #1099 from andrerod/dev

Add PEM file support