Made a few things properties
Merge branch 'master' into code-improvements

Conflicts:
	state_engine.py