Push updated parser code, no errors so far (#17)