working parser changes for updated BNF
Merging upstream
V2 API docs
Merging new docs