Merge branch 'devel'

Added World class and some function to it