Fixes #4. Parser reverted to 1c35e415bfafcb49749aedf4fcbb0169fd66e194