Merge pull request #40 from nordquant/certfinal