Minor changes
Reorganize setSelected()
Merge pull request #229 from vsn4ik/master

Minor changes