Fix for #451
Cleanup for #451
Update fix for #451
Merge pull request #457 from hav3n/branch-fix-certify

Fix for #451