Parser changed to use scala.util.parsing.combinator._ instead of "home brewed" solution.