Merge pull request #1 from snakefooc/luis

Luis