Adding HOSTMAC and other changes
Merge branch 'master' of github.com:larrybreyer/etc