completed parser with tests
Merge pull request #94 from financeCoding/complete_parser_1

completed parser with tests