Feature/selection 2014

@Sjlver could you take a look?