Merge pull request #14 from ladagagina/master

Complete parser