FIX: some bugs, warning prevention
Merge branch 'regexp'
Merge branch 'regexp'
restyling to Google-style