Updated with fixed macaddr version