algunos fixes
Merge branch 'master' of git://github.com/ouruboros/tomalared.git
Merge branch 'master' of git://github.com/ouruboros/tomalared
timeline setup