FIX: Correct version in case of setup.py install
DOC: Added some more doc about tox
Merge remote-tracking branch 'origin/master' into dev