master fixd bug
ubuntu terminal r2_contact merge master