Updated with mac adaption, and a fault in a path that was untested
Merge pull request #5 from Scrier/mac_adapt

Updated with mac adaption, and a fault in a path that was untested