Moved selector code into its own class.
Merge branch 'master' of https://github.com/PerseusDL/bodin