bug fixed version 1.1
Merge branch 'master' into r2_contacts
r2_contacts completed