Merge pull request #888 from dalkon/master

Lua changes