Improve additional signatures
Merge pull request #52 from tmc/master

Improve additional signatures