Edit, first pass
reverted "whilst" on request
Merge pull request #1 from mladoux/master

Edit, first pass