Fixes #2
Introduced a flag for always including operating systems
Added better error handling