Merge branch 'master' of https://github.com/laryssamuniz/Trace-Generator