Merge pull request #3 from dumptruckman/master

Fixing up entity to work better when worldless.
Merge pull request #4 from dumptruckman/master

Hopefully builds for android now..
Added a fix for android platform.
Now compiles for android.