Merge pull request #39 from nordquant/certfinal