new pull request from master branch (Peter/Ben)

Feature mostly implemented; struggling with Cucumber. Trying unsuccessfully to simulate IP addresses using ENV.