"Added geeks as their own choice"
Merge branch 'master' into geeks_update