added ability to parse named parameters