Fixed parser. Resolves #60.