Merge pull request #1 from lerrua/master

Added setup.py
Updates readme
Fixes setup.py
Updates setup.py
Updates README.md