Fix BUG in BETA 2
Merge branch 'master' of https://bitbucket.org/mariovalney/trellatorio