add name checking
Merge origin/master