Switched County to return option instead of null
Merge remote-tracking branch 'origin/master'