Issue #129 - no was
Issue #129 - return parser directly