Contact form correction
Merge origin/master