Fixed #12 pip 1.1 install error
Merge branch 'hotfix/pip-install-error'