Fix multiple addresses#32

jrmhaig wants to merge 2 commits intoahoward:masterahoward/macaddr:masterfrom

jrmhaig:fix_multiple_addressesjrmhaig/macaddr:fix_multiple_addressesCopy head branch name to clipboard