Merge pull request #41 from maaku/virtualenv