Added support for selector
Remove debug function
Merge branch 'mybranch'