Merge pull request #3 from egisatoshi/develop

Update parser
Enable to parse between