Temporary fix for _parse_arg issue with kwargs. Closes #62