Merge pull request #17 from johnneijzen/master

master
Merge pull request #18 from johnneijzen/master

Update
Merge pull request #19 from johnneijzen/Lua-Dev

Lua dev