Update docstrings
Python 2/3 compatibility
Update docstrings