manual additon of changes made in 'droplet-selector' branch
Merge branch 'andy_issue1' into andy_devel