Fixed issue #31 - columns are layed out better, especially mac address.
Merge branch 'feature-issue-31' into develop