Added line parsing method
Added line parsing method
Added line parsing method
Merge origin/master