update positions to proper values
Properly support onselect event
Merge remote-tracking branch 'refs/remotes/origin/master'