Frog Issue 67

Parser changes related to https://github.com/greghendershott/frog/issues/67