customSelect plugin now called at correct point
Merge branch 'develop'