Merge pull request #1 from ElunaLuaEngine/master

Eluna