PaNaVTEC Merge pull request #8 from PaNaVTEC/refactoring_parsing_process