Update with latest from ryanlchan/chosen