2.1.0 - renamed onSelect to onChange
Merge branch 'master' into dev