Fixed #6 - Added company as an address field