Update parser
Merge pull request #3 from egisatoshi/develop

Update parser