Merge pull request #1271 from atetubou/faster_clparser

Faster clparser