Merging new lua stuff into master