Make parsing consistent with the master code
Merge pull request #51 from tomoe/stable/grizzly

Make parsing consistent with the master code