Merge pull request #140 from aseemmittal/master

Sets/resets the flags on entity selection