Decorating a base selector is an optional closes #128
Refactored code duplications
Merge branch '128_Base-selector'