Improved pointer. Now we can select both clusters and single items.
Merge remote-tracking branch 'origin/master'