Docstrings, general beautifications of code
Merge remote-tracking branch 'origin/master'

Conflicts:
	parse.py