add signatureGenerator
Merge origin/master