Simplify and clarify version-specific requires
Merge pull request #133 from ragalie/simplify-requires

Simplify and clarify version-specific requires