Move parsing into seperate parser class
Merge pull request #1 from jobready/feature/parser_class

Move parsing into seperate parser class