fixing bug
Merge branch 'master' of github.com:javisr/trivioca