Added km at public profile and email option
Merge remote-tracking branch 'origin/master'