Merge pull request #1 from LuNaTeCs-316/master

Pull autonomous changes from LuNaTeCs-316/master
Merge pull request #2 from DomenicP/master

Pull Latest version from LuNaTeCs-316