Fixes in documentation and setup.py
Merge pull request #4 from alvarolopez/master

Improved documentation and setup