finally, all master tests passing. fixing signal/type issue
Merge branch 'master' into optimize