Merge pull request #57 from malavolti/master

Certificate replace correctly