More finalized engine, see documentation
Merge remote-tracking branch 'origin/master'

Conflicts:
	*.pyc
*.pyc is now a global ignored item