Added more stuff to support the certificates
Merge remote-tracking branch 'origin/master'