Fixed bug in nonce->set_nonce
Merge branches 'dev' and 'master'