merge changes from luadist