person edit fix
Merge origin/master