Merge pull request #1 from brownplt/new-world

New world - bring up to date
Merge pull request #170 from tsgouros/new-world

Merge pull request #1 from brownplt/new-world