adds multi-address selection
Merge branch 'kh-multi-address'