Parser complete
Merge branch 'master' into parse
Merge pull request #18 from sjafri5/parse

Parse