Modified some Parser statements
Merge branch 'RobsBranch' of https://github.com/rob0229/JARVICE2.0.git
into RobsBranch