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