Updated parser to fix #101