Merge pull request #233 from mpalmer/mac-address