Merge pull request #6 from jied83/jellybean

some fixes
required for hwaddr building

Change-Id: I82e6825a9edfce80ca816a87558891d896aa5eaa
Merge pull request #2 from Bademux/hwaddr

Hwaddr