Order OperatingSystem and HostType as displayed
Merge pull request #4 from paalbra/master

Order OperatingSystem and HostType as displayed