regex for html selector and some minor fixes
Merge branch 'feature/html-selector-regex' #12