whoops!
fixed lua issue
Merge branch 'lua' into ios