Added Name recognition

also cut down on size of name list
Merge remote-tracking branch 'origin/master'

Conflicts:
	simple_fe.py