Merge pull request #17 from lewellyn/os_list