Merging with dev

Adds OAEP and PSS support