Return nil on error cases in ipToMac method
Merge remote-tracking branch 'origin/master'