Merge pull request #7 from johnneijzen/master

Add Master changes to lua-dev
Fix String Error
Merge pull request #8 from johnneijzen/Lua-Dev

Lua dev