fixed signatures
Merge branch '9n1'