restore signature handling
update versions for 2.3.1