merge changes from autobtcpay branch