Added support for full gender names
Merge branch 'feature/fullNames'