Bug Fix v1.1

fixed the bug for version 1.1
Merge remote-tracking branch 'origin/master' into r2_contacts