Improved parse regex
1.0.2