Docs changes
Formatted according to PEP8
Merge remote-tracking branch 'origin/master'