Merge "Fixed a bug and added a function for operating on MAC addresses."