Selector improvements
Merge pull request #53 from maxirosson/dev

Selector improvements