Refactor, extract parser from builder
Merge pull request #54 from jho406/develop/jh-extract-parser

Refactor, extract parser from builder