Add selection and editing handlers
Merge pull request #1 from learning/dev

Add selection and editing handlers