Manually Merge from Sprache/Master

Needed to manually merge the original master branch due to conflicts.
Updated that code to reflect my changes to Parser.cs.