Addressing Tomasz's issues (#2441)
Addressing Tomasz's issues (#2441)

* Addressing Tomasz's issues

* Addressing @antgonza's comments

ElDeveloper/qiita,ElDeveloper/qiita,antgonza/qiita,josenavas/QiiTa,josenavas/QiiTa,josenavas/QiiTa,antgonza/qiita,biocore/qiita,ElDeveloper/qiita,biocore/qiita,josenavas/QiiTa,ElDeveloper/qiita,biocore/qiita,biocore/qiita,antgonza/qiita,antgonza/qiita