sync up with s2robot #112