Added description and instructions in setup.py.
Merge remote-tracking branch 'origin/master'