Parse from file
Merge pull request #1 from allevo/master

Parse from file