Fixes #8 - Reorganize system requirements