fixes to parser and analytics
Merge branch 'master' into parser_test
Merge pull request #32 from nairys/parser_test

Parser test