Mac

Merging Mac Testing branch to master

Added MAC Lookup and Exception handler