Updated selector processing.
Updated selector function.
Merge branch 'master' of https://github.com/joncody/cleanup