Create world inside world container - fixes #70! - closes #70
Merge branch 'master' into uuid-support