Added hyphen formatting option
Added ability for pn_format_num to handle country codes.