Merge pull request #25 from mike08/master

fix world.cpp