Merge branch 'refactor' of https://github.com/teodoryantcheff/OSPy into refactor

Resolved conflicts:
	gv.py
	helpers.py
	options.py
	ospy.py
Performed automatic formatting and fixed comments.
Merge remote-tracking branch 'upstream/refactor' into refactor

Conflicts:
	options.py