Added directive: on-select
Merge branch 'df-sean-master' into master