more refactoring and changed getControls method to filter on sex always
Merge remote-tracking branch 'origin/master'