task #036-Contact_us: MInor fix
Merge branch '036-Contact_us' into develop