Fix for given name Frank
Another 'frank' fix.
Merge branch 'master' into wordgraph