Refactoring for virtualenv
Testing travis