From nkeerthy first
Merge pull request #1 from Jayds/from_mac

From nkeerthy first