integrate david boucha's requirement improvements
Merge pull request #1 from ikbrunel/bug/requirements

integrate david boucha's requirement improvements