Made waddelcert configurable
Merged