Moved parsing out of compile.
Merge remote-tracking branch 'origin/master'