Merge pull request #177 from epequeno/virtualenv