changed nonce handling
Merge branch 'devel' into trx