Fix issues from last merge, add addr_format parser for fi_info.
Merge pull request #56 from pmmccorm/master

Fix issues from last merge, add addr_format parser for fi_info.