Added classifiers to setup.py
Merge branch 'master' into documentation
Updated docstrings for sphinx generated module documentation. Added link to documentation in readme