Made Wilson's changes from pull 3
Made Wilson's commit from pull 3