Pull Latest version from LuNaTeCs-316

Pull autonomous changes from LuNaTeCs-316/master