feature/certificates

bug fix