merge koenpunt/chosen into master