Develop

Pull fixes for lua and python into master.