Fixes #116 - Make parser changes