fix setup.py
fix docstrings
Merge branch 'master' into docs