Fixes #11 - removed dependency on parse_str()