removed getSelection -> now just "selection"
Merge remote-tracking branch 'origin/master'