Implemented 'strict parsing' as in issue #32 by @nemec.