separate into OS names, don't use 'familiy' as it confuses
Merge pull request #314 from tzz/master

validation fixes