Merge pull request #471 from alex/requirements

This is also a requirement