Merge pull request #1 from snakefooc/luis

Luis
Merge pull request #5 from mravinale/master

Merge pull request #1 from snakefooc/luis