Merge branch 'master' into development
Added error-checking

Not all facts exist on every machine.
Changed product name match to use human readable form
Merge branch 'development'
Merge branch 'master' of https://github.com/nmcspadden/WHDBridge