Changed selection mode and fixed some bugs
t
Merge remote-tracking branch 'origin/master'