Merge pull request #3 from xrotwang/master

started work on docs
Merge pull request #4 from xrotwang/master

fixed problem with setup
Merge pull request #5 from xrotwang/master

fixed problem with setup
Update README.md
Update README.rst
fixed merge conflict