Correct parsing for signature
Add test for signature
Merge branch 'signature' into staging