Solving issue 84
Merge branch 'master' of github.com:qiime/QiiTa into issue_84
Really fixing issue 84
Merge pull request #85 from josenavas/issue_84

Solving issue 84
merge upstream/master