some changes but still not working
Merge branch 'master' of https://github.com/jmarti-theinit/titi