Optimize code of parsing
Merge branch 'test' into dev