Certs fix
Merge pull request #921 from affektive/certificatio

Certs fix