Merge pull request #1 from brownplt/new-world

New world - bring up to date