docs updates
docs updates and setup.py update
Merge branch 'devel'