- fix regular expression
- modified class parser